Note

Medium Risk
Changes thread/workspace routing for branch selection in worktree mode; wrong paths could check out the wrong directory, but scope is limited to BranchToolbar logic and covered by unit tests.

Overview
resolveBranchSelectionTarget no longer treats default branches specially when the selected ref has no mapped worktree. Branch switches stay in the active thread worktree (checkoutCwd / nextWorktreePath use activeWorktreePath ?? activeProjectCwd) instead of jumping to the main repo checkout. Behavior when the ref already has a worktreePath is unchanged, including clearing nextWorktreePath when that path is the main project cwd.

The function’s refName input drops isDefault; only worktreePath drives routing. Regression tests in BranchToolbar.logic.test.ts are updated to match the merged “no existing worktree” scenario.

^{Reviewed by Cursor Bugbot for commit a17ba18. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Fix resolveBranchSelectionTarget to keep checkout in current worktree when selected ref has no existing worktree

Previously, resolveBranchSelectionTarget in BranchToolbar.logic.ts would switch to the main repo when the selected ref was a default ref with no existing worktree. Now, when no existing worktree is found for the selected ref, checkout always stays in the active worktree and nextWorktreePath is set to the active worktree path. The isDefault field is removed from the refName input type as it is no longer needed.

^{Macroscope summarized a17ba18.}